From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 28 Feb 2009 12:04:30 +0000 (+0000)
Subject: (detect_coding_charset): Fix change from 2008-10-21.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1494
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=20394343a6d7a9d35a2cdf6fe4b584d1c3cb342d;p=emacs.git

(detect_coding_charset): Fix change from 2008-10-21.
Also, check iso-latin-*, not only iso-8859-*.
---

diff --git a/src/coding.c b/src/coding.c
index 7438fc0d337..020a1401575 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5103,7 +5103,10 @@ detect_coding_charset (coding, detect_info)
   valids = AREF (attrs, coding_attr_charset_valids);
   name = CODING_ID_NAME (coding->id);
   if (VECTORP (Vlatin_extra_code_table)
-      && strcmp ((char *) SDATA (SYMBOL_NAME (name)), "iso-8859-") == 0)
+      && (strncmp ((char *) SDATA (SYMBOL_NAME (name)),
+		   "iso-8859-", sizeof ("iso-8859-") - 1) == 0
+	  || strncmp ((char *) SDATA (SYMBOL_NAME (name)),
+		      "iso-latin-", sizeof ("iso-latin-") - 1) == 0))
     check_latin_extra = 1;
   if (! NILP (CODING_ATTR_ASCII_COMPAT (attrs)))
     src += head_ascii;